Revision: baz--authentication--1.3--patch-14
Archive: jblack@gnuarch.org--2005
Creator: James Blackwell <jblack@canonical.com>
Date: Tue Apr 19 00:51:11 EDT 2005
Standard-date: 2005-04-19 04:51:11 GMT
Modified-files: commands/ancestry.c libarch/ancestry.c
    libarch/ancestry.h libarch/apply-changeset.c
    libarch/build-revision.c libarch/diffs.c libarch/diffs.h
    libarch/local-cache.c libarch/make-changeset.c
    tests/test-merge.sh
New-patches: jblack@gnuarch.org--2005/baz--authentication--1.3--patch-14
    lord@emf.net--2005/tla--devo--1.3.2--patch-6
    lord@seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0
    lord@seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--base-0
    lord@seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--patch-1
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-67
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-10
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-11
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-12
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-13
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-14
    robert.collins@canonical.com--general/bazaar--devel--1.4--patch-15
    thelove@canonical.com/bazaar--devo--1.3--patch-75
    thelove@canonical.com/bazaar--devo--1.3--patch-76
    thelove@canonical.com/bazaar--devo--1.4--patch-13
    thelove@canonical.com/bazaar--devo--1.4--patch-14
    thelove@canonical.com/bazaar--devo--1.4--patch-15
Removed-patches: jblack@gnuarch.org--2005/baz--sftpauto--1.4--base-0
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-1
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-2
    jblack@gnuarch.org--2005/baz--sftpauto--1.4--patch-3
Summary: merge from upstream
Keywords: 

Patches applied:

 * lord@emf.net--2005/tla--devo--1.3.2--patch-6
   [CLOSE inode-sig]

 * lord@seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0
   tag of lord@emf.net--2005/tla--devo--1.3.2--patch-5

 * lord@seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--base-0
   tag of lord@seyza.com--sandia-jjengland-2005/tla--devo--1.3.2--base-0

 * lord@seyza.com--sandia-jjengland-2005/tla--inode-fix--1.3.2--patch-1
   [CLOSE sandia-jjengland/inode-sig]

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-67
   merge in update correctness. ancestry aggresiveness reduction, and get scan reduction

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-10
   make baz less ancestry greedy, and have the builder record the ancestry it encounters

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-11
   performance tune baz get for long lived trees

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-12
   merge in inode-sigs hide permission changes bugfix from tla 1.3.2

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-13
   merge thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-14
   add test for three way merging when tagging rules change

 * robert.collins@canonical.com--general/bazaar--devel--1.4--patch-15
   bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.

 * thelove@canonical.com/bazaar--devo--1.3--patch-75
   merge in update correctness. ancestry aggresiveness reduction, and get scan reduction

 * thelove@canonical.com/bazaar--devo--1.3--patch-76
   bugfix three-way patch application, symlink adds when the symlink exists are not conflicts if the target is the same.

 * thelove@canonical.com/bazaar--devo--1.4--patch-13
   Wrote a parser so that authinfo can handle quotes. 

 * thelove@canonical.com/bazaar--devo--1.4--patch-14
   make baz less ancestry greedy, and have the builder record the ancestry it encounters

 * thelove@canonical.com/bazaar--devo--1.4--patch-15
   performance tune baz get for long lived trees

